Fix chip-tool open-commissioning-window to not crash. #11645
Merged
+9
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pullapprove
bot
requested review from
andy31415,
anush-apple,
balducci-apple,
carol-apple,
cecille,
chrisdecenzo,
chulspro,
Damian-Nordic,
electrocucaracha,
emargolis,
erjiaqing,
franck-apple,
harimau-qirex,
hawk248,
jelderton,
jepenven-silabs,
jmartinez-silabs,
kpschoedel,
LuDuda,
mlepage-google,
mrjerryjohns,
msandstedt,
mspang,
pan-apple,
sagar-apple,
saurabhst,
selissia,
tecimovic and
vivien-apple
pullapprove
bot
requested review from
wbschiller,
woody-apple and
yunhanw-google
jmartinez-silabs
approved these changes
Nov 10, 2021
bzbarsky-apple
force-pushed
the
fix-chip-tool-open-commissioning-window
branch
from
ce8830f to
43ec045
Compare
|
/rebase |
PairingCommand::RunCommand called mController.RegisterPairingDelegate even in the open-commissioning-window case. Then when the device was connected we'd land in DeviceCommissioner::OnDeviceConnectedFn. This would call OnCommissioningComplete on the pairing delegate, which would land us in PairingCommand::OnCommissioningComplete and thinks the command is done. So we would exit without waiting for an actual response from the server and with exchanges still open. In PairingMode::OpenCommissioningWindow we should not be registering as a pairing delegate and whatnot; we are just sending normal cluster commands. Fixes project-chip#11644
woody-apple
force-pushed
the
fix-chip-tool-open-commissioning-window
branch
from
43ec045 to
de2cb4d
Compare
|
PR #11645: Size comparison from 0528ce0 to de2cb4d Increases (2 builds for esp32, linux)
Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
|
andy31415
approved these changes
Nov 11, 2021
woody-apple
approved these changes
Nov 11, 2021
PSONALl
pushed a commit
to PSONALl/connectedhomeip
that referenced
this pull request
Dec 3, 2021
…1645) PairingCommand::RunCommand called mController.RegisterPairingDelegate even in the open-commissioning-window case. Then when the device was connected we'd land in DeviceCommissioner::OnDeviceConnectedFn. This would call OnCommissioningComplete on the pairing delegate, which would land us in PairingCommand::OnCommissioningComplete and thinks the command is done. So we would exit without waiting for an actual response from the server and with exchanges still open. In PairingMode::OpenCommissioningWindow we should not be registering as a pairing delegate and whatnot; we are just sending normal cluster commands. Fixes project-chip#11644
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PairingCommand::RunCommand called mController.RegisterPairingDelegate
even in the open-commissioning-window case. Then when the device was
connected we'd land in DeviceCommissioner::OnDeviceConnectedFn. This
would call OnCommissioningComplete on the pairing delegate, which
would land us in PairingCommand::OnCommissioningComplete and thinks
the command is done.
So we would exit without waiting for an actual response from the
server and with exchanges still open.
In PairingMode::OpenCommissioningWindow we should not be registering
as a pairing delegate and whatnot; we are just sending normal cluster
commands.
Fixes #11644
Problem
See above.
Change overview
See above.
Testing
Manually ran steps from #11644 and verified crash before this change, no crash after.